From: Alan Mackenzie <acm@muc.de>
Date: Sat, 21 Nov 2009 10:31:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9318
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ab1aa7e19d2e66537637d5d5674700c98bcf5bd8;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83ca9ff3a21..00454ff7fdf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-21  Nathaniel Flath  <flat0103@gmail.com>
+
+	* progmodes/cc-menus.el (cc-imenu-java-generic-expression): A
+	corrected version of the patch from 2009-11-18.  (Bug#3910)
+
+2009-11-21  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-menus.el (cc-imenu-java-generic-expression): Update
+	to deal with modern Java constructs.
+
 2009-11-21  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* progmodes/subword.el: Rename from lisp/subword.el.